Autogenerated HTML docs for v1.8.2.1-418-gaec3f
diff --git a/RelNotes/1.8.3.txt b/RelNotes/1.8.3.txt index bcbcf15..516d929 100644 --- a/RelNotes/1.8.3.txt +++ b/RelNotes/1.8.3.txt
@@ -67,6 +67,9 @@ ref by specifying a raw object name from the command line when the server side supports this feature. + * Output from "git log --graph" works better with submodule log + output now. + * "git count-objects -v" learned to report leftover temporary packfiles and other garbage in the object store. @@ -160,6 +163,28 @@ track are contained in this release (see release notes to them for details). + * Perl scripts like "git-svn" closed (not redirecting to /dev/null) + the standard error stream, which is not a very smart thing to do. + Later open may return file descriptor #2 for unrelated purpose, and + error reporting code may write into them. + (merge a749c0b tr/perl-keep-stderr-open later to maint). + + * "git show-branch" was not prepared to show a very long run of + ancestor operators e.g. foobar^2~2^2^2^2...^2~4 correctly. + (merge aaa07e3 jk/show-branch-strbuf later to maint). + + * "git diff --diff-algorithm algo" is also understood as "git diff + --diff-algorithm=algo". + (merge 0895c6d jk/diff-algo-finishing-touches later to maint). + + * The new core.commentchar configuration was not applied to a few + places. + (merge 89c3bbd rt/commentchar-fmt-merge-msg later to maint). + + * "git bundle" did not like a bundle created using a commit without + any message as its one of the prerequistes. + (merge 5446e33 lf/bundle-with-tip-wo-message later to maint). + * "git log -S/-G" started paying attention to textconv filter, but there was no way to disable this. Make it honor --no-textconv option.
diff --git a/git-merge.html b/git-merge.html index 99beab4..97e8da2 100644 --- a/git-merge.html +++ b/git-merge.html
@@ -1397,6 +1397,17 @@ </p> </dd> <dt class="hdlist1"> +diff-algorithm=[patience|minimal|histogram|myers] +</dt> +<dd> +<p> + Tells <em>merge-recursive</em> to use a different diff algorithm, which + can help avoid mismerges that occur due to unimportant matching + lines (such as braces from distinct functions). See also + <a href="git-diff.html">git-diff(1)</a> <code>--diff-algorithm</code>. +</p> +</dd> +<dt class="hdlist1"> ignore-space-change </dt> <dt class="hdlist1">
diff --git a/git-pull.html b/git-pull.html index 4616452..35be5fa 100644 --- a/git-pull.html +++ b/git-pull.html
@@ -1616,6 +1616,17 @@ </p> </dd> <dt class="hdlist1"> +diff-algorithm=[patience|minimal|histogram|myers] +</dt> +<dd> +<p> + Tells <em>merge-recursive</em> to use a different diff algorithm, which + can help avoid mismerges that occur due to unimportant matching + lines (such as braces from distinct functions). See also + <a href="git-diff.html">git-diff(1)</a> <code>--diff-algorithm</code>. +</p> +</dd> +<dt class="hdlist1"> ignore-space-change </dt> <dt class="hdlist1">
diff --git a/git-rebase.html b/git-rebase.html index 3fb97e7..977f76c 100644 --- a/git-rebase.html +++ b/git-rebase.html
@@ -1375,6 +1375,17 @@ </p> </dd> <dt class="hdlist1"> +diff-algorithm=[patience|minimal|histogram|myers] +</dt> +<dd> +<p> + Tells <em>merge-recursive</em> to use a different diff algorithm, which + can help avoid mismerges that occur due to unimportant matching + lines (such as braces from distinct functions). See also + <a href="git-diff.html">git-diff(1)</a> <code>--diff-algorithm</code>. +</p> +</dd> +<dt class="hdlist1"> ignore-space-change </dt> <dt class="hdlist1">
diff --git a/merge-strategies.txt b/merge-strategies.txt index 66db802..49a9a7d 100644 --- a/merge-strategies.txt +++ b/merge-strategies.txt
@@ -48,6 +48,12 @@ this when the branches to be merged have diverged wildly. See also linkgit:git-diff[1] `--patience`. +diff-algorithm=[patience|minimal|histogram|myers];; + Tells 'merge-recursive' to use a different diff algorithm, which + can help avoid mismerges that occur due to unimportant matching + lines (such as braces from distinct functions). See also + linkgit:git-diff[1] `--diff-algorithm`. + ignore-space-change;; ignore-all-space;; ignore-space-at-eol;;
